From: Chong Yidong <cyd@stupidchicken.com>
Date: Fri, 22 Jul 2011 15:23:43 +0000 (-0400)
Subject: Merge fix for Bug#4238 from trunk
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~421^2~17^2~45
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=ccf38e88b051ccbbbcdfef9ad713f8e5ffd85adb;p=emacs.git

Merge fix for Bug#4238 from trunk
---

ccf38e88b051ccbbbcdfef9ad713f8e5ffd85adb